text: Delete selection when preedit starts

This prevents confusing misrendering when the preedit text
pushes the selection text out of the rendered selection.

Fixes: #1123

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index f2f1f854b064ce01971e53c57782545a2026f4d0..7791029e52607ccd83b31997aa0ec39b4df22100 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -418,6 +418,8 @@ static void     direction_changed           (GdkDevice       *keyboard,
 static void     gtk_text_commit_cb               (GtkIMContext *context,
                                                   const char   *str,
                                                   GtkText      *self);
+static void     gtk_text_preedit_start_cb        (GtkIMContext *context,
+                                                  GtkText      *self);
 static void     gtk_text_preedit_changed_cb      (GtkIMContext *context,
                                                   GtkText      *self);
 static gboolean gtk_text_retrieve_surrounding_cb (GtkIMContext *context,
@@ -1843,6 +1845,8 @@ gtk_text_init (GtkText *self)
    */
   priv->im_context = gtk_im_multicontext_new ();
 
+  g_signal_connect (priv->im_context, "preedit-start",
+                    G_CALLBACK (gtk_text_preedit_start_cb), self);
   g_signal_connect (priv->im_context, "commit",
                     G_CALLBACK (gtk_text_commit_cb), self);
   g_signal_connect (priv->im_context, "preedit-changed",
@@ -4150,6 +4154,13 @@ direction_changed (GdkDevice  *device,
 /* IM Context Callbacks
  */
 
+static void
+gtk_text_preedit_start_cb (GtkIMContext *context,
+                           GtkText      *self)
+{
+  gtk_text_delete_selection (self);
+}
+
 static void
 gtk_text_commit_cb (GtkIMContext *context,
                     const char   *str,